Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dbapi connection instrument wrapper has no _sock member #1424

Merged
merged 1 commit into from
Nov 7, 2022

Conversation

rogersd
Copy link
Contributor

@rogersd rogersd commented Oct 31, 2022

Description

Fix the check for the connection already being instrumented in instrument_connection()
Add tests for commit() and rollback()
Add a couple missing docstring items.
Add basepython to docker-tests to fix running the tests on macOS.

Based on #1382

Fixes #1353

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

  • Wrote and ran new unit tests.

Does This PR Require a Core Repo Change?

  • No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added

@rogersd rogersd requested a review from a team October 31, 2022 16:31
@rogersd
Copy link
Contributor Author

rogersd commented Oct 31, 2022

@srikanthccv @ocelotl May you both please take a look at this and let me know what you think?

@rogersd rogersd force-pushed the drogers-dbapi-sock branch 2 times, most recently from c9773b1 to 7f3d422 Compare October 31, 2022 22:35
@rogersd rogersd force-pushed the drogers-dbapi-sock branch 2 times, most recently from 7e6e190 to 2b055d7 Compare November 3, 2022 17:59
@rogersd
Copy link
Contributor Author

rogersd commented Nov 3, 2022

@lzchen Any chance you can get this in to 0.35b0? pymysql instrumentation is broken without it.

CHANGELOG.md Outdated Show resolved Hide resolved
@rogersd rogersd force-pushed the drogers-dbapi-sock branch from d319e45 to 88c6177 Compare November 4, 2022 15:02
Fixes open-telemetry#1353

Also:

Fix the check for the connection already being instrumented in instrument_connection()
Add tests for commit() and rollback()
Add a couple missing docstring items.
Add basepython to docker-tests to fix running the tests on macOS.
@rogersd rogersd force-pushed the drogers-dbapi-sock branch from 88c6177 to 236f81e Compare November 7, 2022 15:25
@ocelotl ocelotl enabled auto-merge (squash) November 7, 2022 15:57
@ocelotl ocelotl merged commit 40e4e2e into open-telemetry:main Nov 7, 2022
@rogersd rogersd deleted the drogers-dbapi-sock branch November 7, 2022 16:11
saartochner-lumigo pushed a commit to lumigo-io/opentelemetry-python-contrib that referenced this pull request Nov 13, 2022
…emetry#1424)

Fixes open-telemetry#1353

Also:

Fix the check for the connection already being instrumented in instrument_connection()
Add tests for commit() and rollback()
Add a couple missing docstring items.
Add basepython to docker-tests to fix running the tests on macOS.
saartochner-lumigo pushed a commit to lumigo-io/opentelemetry-python-contrib that referenced this pull request Nov 13, 2022
…emetry#1424)

Fixes open-telemetry#1353

Also:

Fix the check for the connection already being instrumented in instrument_connection()
Add tests for commit() and rollback()
Add a couple missing docstring items.
Add basepython to docker-tests to fix running the tests on macOS.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

conn.commit() raise InterfaceError because connection instrument wrapper has no _sock member
3 participants